bug fixinf