Fixed issue with OR statement