fix for Issue #31