Fixed top message duplicated