added patch manually to scramble, untested