Fix #1582