Better compat