Fixed #3.
Fixed #1.