Fix #1136