Finally really fixed magic shuffle