Pagination in search result page has errors

There is a problem search result page.
If the results are displayed in more than one page, in the bottom of the page a page selector is shown.

When the result pages are more than 11 there are two problems:

1) when clicking on page nr 9, the page numbering is corrupted and, instead of showing the correct sequence, it's shown the sequence 1,1,4,5,6,7,8,9,10 where 10 is shown as current page in place of 9 (see image error nr 9.jpg)
2) the last page number is wrong: i.e if the total results are 535 the last page should be 54 (10 results per page) but number 53 is shown. If you click on the last page, correct number 54 is shown instead of 53 (see image error end.jpg).

Digging in the code i found that the error is velocity macro paginationBase, located in file macros.vm.

I'm trying to write down a patch for this but help would be appricieted