Eliminate new map and map finished at the same time