fix for Issue #52