[DNM] Fixes #6348

DNM, testing.