6.7.6 compatibility
[Code Cleanup]