Fix #1023