Fix for issue #609.