Fixed #80.
Fixed #88.