Last changes : fixing index if no activ poll