Merged #407
Make debugging script issue a bit easier