deprecation-related fix in extra_options