Bug fixe for first mode