Fixed possible entry del vs pop issue