Changed map variable assignment