fixing variable collision
fixing map key usage