updated bug fix from class