Fix up issue with detecting that a field exists correctly