more work on #5385