Allowed number of attempts fails when store results is different from all

Quiz give us the posibility to control "The number of times a user is allowed to take this Quiz".
When "All" option in "Store Results" is checked everything works fine, but if other option ("the best", "the newest") is selected the times counters always shows 1, and the evaluated can still answer the test even if he exceeded the configured number of times for this test.

The origin of the problem is the way quiz compute the taken test per user. It uses a SQL query (quiz.module: line 2324):

$taken = db_query("SELECT COUNT(*) AS takes FROM {quiz_node_results} WHERE uid = :uid AND nid = :nid", array(':uid' => $user->uid, ':nid' => $quiz->nid))->fetchField();

When, Store Results, use All, it will be one record per test application, but when other opción is selected, there will be only one record per user (two records when the test is in progress, because a new record is created during this moment). The proposed solution is to modified the SQL query, in order to have something like this:

$taken = db_query("SELECT MAX(attempt) AS takes FROM {quiz_node_results} WHERE is_evaluated = 1 AND uid = :uid AND nid = :nid", array(':uid' => $user->uid, ':nid' => $quiz->nid))->fetchField();

It works because count the max attempt (a field with the attempt number per record), and with the filter is_evaluated, to avoid count the in progress test. I have a path, but I still testing it. I will post this patch soon.