Fixed #9, #10