Added check for fields