issue #547