Fix for Issue #349.