fix for Issue #44