fixed bug regarding "or" operators.