Fix #1221