FIXED SOME SHIT