Fix #1122