Fix for issue #1624