Fix bug about #612