Fixed "or" blocks