Should fix bug with MATCHING question type when using shuffling answers see BT#6560