Fix to make it work with the new compiler.