FIXED SHIT AGAIN