diff --git a/project/include/text/TextLayout.h b/project/include/text/TextLayout.h
index 7427a012a..521ebc79b 100644
--- a/project/include/text/TextLayout.h
+++ b/project/include/text/TextLayout.h
@@ -22,9 +22,9 @@ namespace lime {
 		private:
 			
 			void *mBuffer;
-			int mDirection;
-			int mScript;
-			int mLanguage;
+			long mDirection;
+			long mScript;
+			long mLanguage;
 			
 	};
 	
@@ -32,4 +32,4 @@ namespace lime {
 }
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/project/src/text/TextLayout.cpp b/project/src/text/TextLayout.cpp
index 3ca9fe230..350b48487 100644
--- a/project/src/text/TextLayout.cpp
+++ b/project/src/text/TextLayout.cpp
@@ -14,7 +14,7 @@ namespace lime {
 		if (strlen (script) != 4) return;
 		
 		mDirection = (hb_direction_t)direction;
-		mLanguage = (int)hb_language_from_string (language, strlen (language));
+		mLanguage = (long)hb_language_from_string (language, strlen (language));
 		mScript = hb_script_from_string (script, -1);
 		
 		mBuffer = hb_buffer_create ();
@@ -84,4 +84,4 @@ namespace lime {
 	}
 	
 	
-}
\ No newline at end of file
+}