Fix #1032