Fix #1284