Quiz repaginate enter in a endless loop

A quiz instance without questions and variable layout/Question order turned in "shuffled randomly" creates an endless loop in mod/quiz/locallib.php line 348.

To make a quick fix i made this:

function quiz_repaginate($layout, $perpage, $shuffle = false) {
$layout = str_replace(',0', '', $layout); // remove existing page breaks
$questions = explode(',', $layout);
//remove empty pages from beginning

if(count($questions)!==1){ //only paginate if there is at least one question
while (reset($questions) == '0')

if ($shuffle)

$i = 1;
$layout = '';
foreach ($questions as $question) {
if ($perpage and $i > $perpage)

$layout .= $question.',';
$i++;
}
return $layout.'0';
}
}