Replace deprecated 'or'