Fix for issue #551.