6.7.2 compatibility
1.0.39