Fix for Issue #552