done with the preliminary bug fix