6.7.x compatibility
0.5.31