Fixed #69 thanks to @marklocklear's help and removed debugger call