Fix form inheritance issue with FormContainer