Fixed #78.
Fixed #83.