Fixing roster bug