Trying to fix this damn thing