Fixed it nicer