Fixed it better