Fix #1117