diff --git a/num2words/__init__.py b/num2words/__init__.py
index baba5bd..dc42220 100644
--- a/num2words/__init__.py
+++ b/num2words/__init__.py
@@ -17,17 +17,17 @@
 
 from __future__ import unicode_literals
 
-from . import (lang_AR, lang_CZ, lang_DE, lang_DK, lang_EN, lang_EN_IN,
-               lang_ES, lang_ES_CO, lang_ES_NI, lang_ES_VE, lang_FA, lang_FI,
-               lang_FR, lang_FR_BE, lang_FR_CH, lang_FR_DZ, lang_HE, lang_HU,
-               lang_ID, lang_IT, lang_JA, lang_KN, lang_KO, lang_KZ, lang_LT,
-               lang_LV, lang_NL, lang_NO, lang_PL, lang_PT, lang_PT_BR,
-               lang_RO, lang_RU, lang_SL, lang_SR, lang_SV, lang_TE, lang_TH,
-               lang_TR, lang_UK, lang_VI, lang_AM)
+from . import (lang_AM, lang_AR, lang_CZ, lang_DE, lang_DK, lang_EN,
+               lang_EN_IN, lang_ES, lang_ES_CO, lang_ES_NI, lang_ES_VE,
+               lang_FA, lang_FI, lang_FR, lang_FR_BE, lang_FR_CH, lang_FR_DZ,
+               lang_HE, lang_HU, lang_ID, lang_IT, lang_JA, lang_KN, lang_KO,
+               lang_KZ, lang_LT, lang_LV, lang_NL, lang_NO, lang_PL, lang_PT,
+               lang_PT_BR, lang_RO, lang_RU, lang_SL, lang_SR, lang_SV, lang_TE,
+               lang_TH, lang_TR, lang_UK, lang_VI)
 
 CONVERTER_CLASSES = {
-    'ar': lang_AR.Num2Word_AR(),
     'am': lang_AM.Num2Word_AM(),
+    'ar': lang_AR.Num2Word_AR(),
     'cz': lang_CZ.Num2Word_CZ(),
     'en': lang_EN.Num2Word_EN(),
     'en_IN': lang_EN_IN.Num2Word_EN_IN(),
diff --git a/num2words/lang_AM.py b/num2words/lang_AM.py
index 4072559..4e40bda 100644
--- a/num2words/lang_AM.py
+++ b/num2words/lang_AM.py
@@ -93,7 +93,7 @@ class Num2Word_AM(lang_EU.Num2Word_EU):
 
     def to_ordinal_num(self, value):
         self.verify_ordinal(value)
-        return "%s%s" % (value, self.to_ordinal(value)[-2:])
+        return "%s%s" % (value, self.to_ordinal(value)[-1:])
 
     def to_currency(self, val, currency='ብር', cents=True, separator=' ከ',
                     adjective=True):
diff --git a/tests/test_am.py b/tests/test_am.py
index 6c47955..a3dc95d 100644
--- a/tests/test_am.py
+++ b/tests/test_am.py
@@ -38,19 +38,38 @@ class Num2WordsAMTest(TestCase):
             'ሃያ ሁለተኛ'
         )
 
+    def test_ordinal_num(self):
+        self.assertEqual(num2words(10, lang='am', to='ordinal_num'), '10ኛ')
+        self.assertEqual(num2words(21, lang='am', to='ordinal_num'), '21ኛ')
+        self.assertEqual(num2words(102, lang='am', to='ordinal_num'), '102ኛ')
+
+    def test_cardinal_for_float_number(self):
+        self.assertEqual(num2words(12.5, lang='am'), "አሥራ ሁለት ነጥብ አምስት")
+        self.assertEqual(num2words(12.51, lang='am'), "አሥራ ሁለት ነጥብ አምስት አንድ")
+        self.assertEqual(num2words(12.53, lang='am'), "አሥራ ሁለት ነጥብ አምስት ሦስት")
+
+    def test_overflow(self):
+        with self.assertRaises(OverflowError):
+            num2words("1000000000000000000000000000000000000000000000000000000"
+                      "0000000000000000000000000000000000000000000000000000000"
+                      "0000000000000000000000000000000000000000000000000000000"
+                      "0000000000000000000000000000000000000000000000000000000"
+                      "0000000000000000000000000000000000000000000000000000000"
+                      "00000000000000000000000000000000", lang='am')
+
     def test_to_currency(self):
         self.assertEqual(
-            num2words('38.4', lang='am', to='currency', cents=False, currency='ETB'),
-            "ሠላሳ ስምንት ብር ከ 40 ሳንቲም"
+            num2words('38.4', lang='am', to='currency', cents=False,
+                      currency='ETB'), "ሠላሳ ስምንት ብር ከ 40 ሳንቲም"
         )
         self.assertEqual(
-            num2words('0', lang='am', to='currency', separator=' እና', cents=True, currency='ETB'),
-            "ዜሮ ብር እና ዜሮ ሳንቲም"
+            num2words('0', lang='am', to='currency', separator=' እና',
+                      cents=True, currency='ETB'), "ዜሮ ብር እና ዜሮ ሳንቲም"
         )
 
         self.assertEqual(
-            num2words('1.50', lang='am', to='currency', cents=True, currency='ETB'),
-            "አንድ ብር ከ አምሳ ሳንቲም"
+            num2words('1.50', lang='am', to='currency', cents=True,
+                      currency='ETB'), "አንድ ብር ከ አምሳ ሳንቲም"
         )
 
     def test_to_year(self):