diff --git a/application/controllers/scheduler/s_twitter.php b/application/controllers/scheduler/s_twitter.php
index 3dd62b02c3..2433932b68 100644
--- a/application/controllers/scheduler/s_twitter.php
+++ b/application/controllers/scheduler/s_twitter.php
@@ -132,8 +132,8 @@ private function add_hash_tweets($data)
 				$tweet_lon = null;
 				if ($tweet->{'coordinates'} != null)
 				{
-					$tweet_lat = $tweet->{'coordinates'}->coordinates[0];
-					$tweet_lon = $tweet->{'coordinates'}->coordinates[1];
+					$tweet_lat = $tweet->{'coordinates'}->coordinates[1];
+					$tweet_lon = $tweet->{'coordinates'}->coordinates[0];
 				}
 
 				// Save Tweet as Message
diff --git a/application/i18n b/application/i18n
index fc788997a2..8acd68e891 160000
--- a/application/i18n
+++ b/application/i18n
@@ -1 +1 @@
-Subproject commit fc788997a2e8a16917da4f96bd9f9856c40bbcd4
+Subproject commit 8acd68e891a13a385ab24e66a56795d2dc0f5c3f