Completed fix as for subscription on channels on which client already subscribed and procedural lock