Fixed forms not saving properly