Fixed #7.
Fixed #6.