Yet improve manual test for issue 6740