Fix #1583