A little better fix