[Code Cleanup] 6.3 compatibility
0.5.15