Fix for Issue #312