+ Fixed route remaining for OS6 & OS7