Fix exchange with keys that had Q automatically computed (redux)

Fix exchange with keys that had Q automatically computed (redux) #4197