Fix to deal with new compiler