Fix form wrapper