hardcore bug fix