bug fix cont.