diff --git a/ICore.h b/ICore.h
index 7aa395b..8d3676c 100644
--- a/ICore.h
+++ b/ICore.h
@@ -383,7 +383,7 @@ namespace alt
 		 * @param args answer args
 		 * @param error error string
 		 */
-		virtual void TriggerClientRPCAnswer(IPlayer* target, uint16_t answerID, MValueArgs args, const std::string& error) = 0;
+		virtual void TriggerClientRPCAnswer(IPlayer* target, uint16_t answerID, MValue args, const std::string& error) = 0;
 		virtual void TriggerClientEvent(std::vector<IPlayer*> targets, const std::string& ev, MValueArgs args) = 0;
 		virtual void TriggerClientEventForAll(const std::string& ev, MValueArgs args) = 0;
 
diff --git a/events/CClientScriptRPCEvent.h b/events/CClientScriptRPCEvent.h
index f4dd764..f16f3b8 100644
--- a/events/CClientScriptRPCEvent.h
+++ b/events/CClientScriptRPCEvent.h
@@ -43,7 +43,7 @@ namespace alt
 			return true;
 		}
 
-		bool Answer(MValueArgs _answer)
+		bool Answer(MValue _answer)
 		{
 			if (state == State::ANSWERED)
 			{
@@ -67,7 +67,7 @@ namespace alt
 
 		State GetState() const { return state; }
 
-		MValueArgs GetAnswer() const { return answer; }
+		MValue GetAnswer() const { return answer; }
 
 		std::string GetAnswerError() const { return answerError; }
 
@@ -77,7 +77,7 @@ namespace alt
 		std::string name;
 		MValueArgs args;
 		uint16_t answerID;
-		MValueArgs answer;
+		MValue answer;
 		std::string answerError;
 	};
 #endif
diff --git a/events/CServerScriptRPCAnswerEvent.h b/events/CServerScriptRPCAnswerEvent.h
index 76b668e..39332f5 100644
--- a/events/CServerScriptRPCAnswerEvent.h
+++ b/events/CServerScriptRPCAnswerEvent.h
@@ -12,7 +12,7 @@ namespace alt
 	class CServerScriptRPCAnswerEvent : public CEvent
 	{
 	public:
-        CServerScriptRPCAnswerEvent(uint16_t _answerID, const MValueArgs& _answer, const std::string& _error) :
+        CServerScriptRPCAnswerEvent(uint16_t _answerID, const MValue& _answer, const std::string& _error) :
 			CEvent(Type::SERVER_SCRIPT_RPC_ANSWER_EVENT),
 			answer(_answer),
 			answerError(_error)
@@ -21,12 +21,12 @@ namespace alt
 		}
 
 		uint16_t GetAnswerID() const { return answerID; }
-		MValueArgs GetAnswer() const { return answer; }
+		MValue GetAnswer() const { return answer; }
 		std::string GetAnswerError() const { return answerError; }
 
 	private:
 		uint16_t answerID;
-		MValueArgs answer;
+		MValue answer;
 		std::string answerError;
 	};
 #endif