Tried to fix formhandler