issue #505