Fix Some bugs #29