Fixed #10,#12