Fix #1066