Fixed #1173, part 2