Avoid using a deprecated option