Fix for issue #1473