Fix the proper way.