better compat fix