Fixed #595