Fix the proper thing