Fixed #2.
Fixed #4.