Fixed a bug in SendAndPopSameClient