bug fix core