Lets change this to && instead of ||