Fix #1220 part2