fix forms behaviour