Issue #136

Add debugging information for #136