Should check for && instead of ||