1st bug fix