Fix to not remove from internal map.