Be compatible with recent atoum modifications.