Fixed bug with || operator