Proper fix for previous commit in roster_cleanup()