Fix for issue #447.