Fixed shuffle functionality