fix for Issue #119