Fix #1135