Fixed #2.
Fixed #3.