better handling of interop forms