And Fixed it!