updated definition of right-of for more robust behavior