Fixed it all for good