Finally fixed overwriting of data in rosters