Fix discarding of message tags