Adapted to Magnum changes. No more <>!