Fix #1811