Fix for issue #1512