Update to fit deadlock issue for MAP/CAP/TCAP