Issue #569

Fix for Issue #569