FIXING SHIT