Fix #1127