Don't unnecessarily create objects for roster items
Bugfix. Wrong global variable set