More 5.2 fix