Fix for issue #385.