fixing extra 'OR' at the end