Fixing an error of duplicated messages