Fixing dumb mistake ("||" instead of "&&")