Bug fix on communication plugins