fixing map .. again