One more possible fix of Data.Map