Fix #618