Bugs/1521

Fix for Issue #1521