Fix form retrieve