Keep retro-compatibility