be a bit more careful about origin owner matching