some bug fix;