fixed STUFF