NCompiler partial fix