Further fix for roster_update