Fix #1107