fix for issue #159 - stopping the insanity