Fix for 6.5