Added proper debug messages for workaround of #19