5.3.x compatibility

5.3.x compatibility