No longer need hack to make the code appear in the debugger :-)