Fix #1224