Fix for Issue #538