Fix #1060