fixed SHIT