6.7.6 compatibility
0.5.32