Fix for issue #1357

Fix for issue #1357