*bug fix2