issue #595