Reworked the debug problem, reverted hack.