Universal fix