It should be `&&` instead of `||`. Didn't noticed it in your first commit, sorry. :/