Fix comments acquisition

We have a fix to comments acquisition and it works for us. But the fix causes another problem with acquisition chain for unwrapped comments. The test that we've added shows the problem.