Fixing fields selection issue