Debugger caused a problem in the last commit - hopefully this corrects the problem