Fix #1087