Adapted to renaming of core method