Fixed issue on serialization on embedded maps