issue #551