Changed an && to an ||