fixed #594