bug fix again ..