fixed #595