Fix #1070