Fixed #65 part 2.