Fixed issue with 6.5 support