resolved some bug fix