issue #540