fixed issue with forms