some bug fix, #33