Bug fix - shuffling answers