Fixed everything for good this time.