should the AND operator not be a OR ( || ) ??

also the comment above (not your commit) is grammatically bad