Fix issue with lists key+1 issue