Fix very obvious off-by-one error, still not tested.
Merge remote-tracking branch 'hub/master'