Current Caller Display is Incorrect After Second Incomming Call

[richwillal]

In the following scenario, my Galaxy Note 3 shows incorrect caller information:

1. Place or receive a call
2. Receive a second call while still in first (answer call waiting)
3. Second caller disconnects and swap back to original call (from step 1)
4. Receive additional incoming call and accept (answer call waiting)
5. Click swap to disconnect second call

In this scenario, the on-screen display shows the second caller (from step 2) as the current call, and the call on hold as the original call (from step 1), when in fact I am talking to the person from step 1.  This can be very confusing when taking conference calls and could lead to significant issues.

Is there a fix or solution for this issue besides disconnecting all calls and re-joining?