Attempt to fix compat