Fix messages getting duplicated when wrapping.