Fixed partially the Scramble issue