One way I was able to work around this issue in EA was to make sure my character was closest to the person you'd talk to at the end of combat. Kind of a hassle