Fixed bug with empty list of maps