Fix #1011