previous exception fix should be an AND statement instead of OR