Fix #1051