6.7.6 compatibility
1.0.34