Scrambling fix