issue #498