Fix for issue #474