fixed bug with form navigation