Are you sure about the `||` ? the if is now always returning true.