Fix back-compat support