Enable returning auto only when safe