fixing Or, doing it wrong again