Fixes #6299
Merge pull request #6947 from mwerezak/pipe-cap

Fixes #6299, Again