Fixed #55.
Fixed #56.