Fix for Issue #476