bug fix start