diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 0941b5876fd..25db8c65b7d 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-26  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* io/transfer.c (transfer_array_inner): Do not
+	cast charlen to index_type.
+
 2019-02-25  Dominique d'Humieres  <dominiq@gcc.gnu.org>
 
 	PR libfortran/89274
@@ -120,7 +125,6 @@
 2019-01-09  Sandra Loosemore  <sandra@codesourcery.com>
 
 	PR other/16615
-
 	* caf/single.c: Mechanically replace "can not" with "cannot".
 	* io/unit.c: Likewise.
 
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 247fb6d2a9c..c43360f6332 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -2496,7 +2496,7 @@ transfer_array_inner (st_parameter_dt *dtp, gfc_array_char *desc, int kind,
     return;
 
   iotype = (bt) GFC_DESCRIPTOR_TYPE (desc);
-  size = iotype == BT_CHARACTER ? (index_type) charlen : GFC_DESCRIPTOR_SIZE (desc);
+  size = iotype == BT_CHARACTER ? charlen : GFC_DESCRIPTOR_SIZE (desc);
 
   rank = GFC_DESCRIPTOR_RANK (desc);