Changes so it works with the last version of core.