Oxygen Pipe - Performance increase and fix #338