Fix #1284 (2)