For ENG-5962, fix bug maintaing maps