The proper fix