Fix for issue #1516