Bugs/1546

Fix for issue #1546