Fix for issue #1357