Fix list-maps to work with polyfill