Fix #612