Fix to map list being reseted quite often