Fix omni extract