fix or instead of and