Fix #1130