Fixed problem with complex disjunctions