Fixing field presence check