issue #517