Fix #602