Make it work with 6.5.