issue #491