fixing shuffle