fixed shuffling bug