closed #593 , closed #594