Fix form in packages