fix and within or+commit

59c8231