Fix for Issue #28