fix for Issue #121