Fix use with omni vendor