bug fixingggg