better check for state field