[fix] Assure retro-compatibility