Changed AND to OR clause to cover both cases.