Fix for issue #605.