Fix for issue #1457