Fix #1037