fixing {if}{fi}, part 1