bug fix2, hack for bug