Reintroduced some missed code during bleeding merge.
Fix a bug in benchmark.
Merge pull request #185 from claudioandre/bleeding-jumbo

Some missed code during the merge.