Fix #1078