some bug shuffling