FIXED SHIT YAY