Fixes #6348
Merge pull request #6349 from mwerezak/pipes

Fixes #6348