Topic and buffer duplication bug fixed