Lifted bug in form handling