Fix i condition