Fix issue with nested blocks in OC