fix for Chris: and to or