Fix roster moves destroying the table