Fix for Issue #46