6.7.2 compatibility
0.5.30