I think `i` should become `it`. But well that is not really topic of the commit :)