Fix #1226