Fix #1061