Fix to create form