Fix #1058