Fixed empty lists