Fix #1086