Fix #1033