Fixing incorrect field default check logic