Make it compile for 6.5