Fixing compilation with  4.7