Fix for github issue #5 and extra logging when the original condition occurs