Fixed bug in F-Y shuffle