follow-up to r8401