Fix ambiguous profile fields

Luca Realdi requested to merge fix-profile-fields into master May 16, 2020