Fixed #602