Fix messages next map