fixing Shit