A better fix