fixes of bug