Fixed annoying Pipe bug