minor change to formhandler