fix form handler