Backport Vivien's patch - throughtput -> throughput