Fix offset issue on i > 0 case