Temporary fix until TCP is put in v2