Renamed header. Fixed crash when map is empty