Fixed a bug which would deadlock the system with partners