Working on #205.
Fixed #205.