FIXING STUFFS