Another 5.3 fix