Made the formhandler work again