Fix for an Issue #495