Fix #1020