Fix #1035