Fixed #2, #3.