Roster bug fix