MOving over the  bug fix