Fix for Issue #53