Fixing pipe behaviour