Fix an issue with someone_added/someone_removed