Fix empty OR blocks