Fix #1129