Fixed #595.