fixes pipes URL #1606 (#1607)
fixes pipes URL #1606 (#1607)

* fixes pipes URL #1606

* a more efficient version of the same code

erasche/Apollo,erasche/Apollo,erasche/Apollo,erasche/Apollo,erasche/Apollo