Fix for issue #1375