INSTEAD export bugfixing