Gson serializer fix