Map set and get fixed