improve compatability with omnibus 3