FIX - serialization of map when key is not String (doing toString() on key object)
fixed previous bad commit