Fixed #43,#46