Workaround for duplicate messages: work in progress.