Fixed #50, part 2 of the question