Fix on tap and tee functions: exchanged roles.