Better 5.2 fix