fixinf bug