Bugfix to match Compiler module