Fix for Issue #495