Issue 5221, more work.