Fix for issue #1360