added option for retro-compatibility purpose