Resolve 1.5
Change on two conditions for each branch.
Fix typo