Try to improve the transport collision issue further