fixed: null ref added to map