bug fix on previous