Temporary hack to work around the "TX overflow" problem in the interim