Fix #1233