fixed #600