Fix for issue #1528