fixes that I don't even remember