Fixed double map issue