#507 fix form