Fix for issue #1462