* bug fix2