diff --git a/java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt b/java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt
index 57a3e92e6b2..76d155f8b22 100644
--- a/java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt
+++ b/java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt
@@ -51,6 +51,8 @@ private val specialFunctions = mapOf(
     makeDescription(FqName("java.lang.Number"), "toFloat") to "floatValue",
     makeDescription(StandardNames.FqNames.number.toSafe(), "toDouble") to "doubleValue",
     makeDescription(FqName("java.lang.Number"), "toDouble") to "doubleValue",
+    makeDescription(StandardNames.FqNames.string.toSafe(), "get") to "charAt",
+    makeDescription(FqName("java.lang.String"), "get") to "charAt",
 )
 
 private val specialFunctionShortNames = specialFunctions.keys.map { it.functionName }.toSet()
diff --git a/java/ql/test/kotlin/library-tests/string-charat/Test.java b/java/ql/test/kotlin/library-tests/string-charat/Test.java
new file mode 100644
index 00000000000..22f553216b7
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/string-charat/Test.java
@@ -0,0 +1,5 @@
+public class Test {
+
+  public char f(String s) { return s.charAt(0); }
+
+}
diff --git a/java/ql/test/kotlin/library-tests/string-charat/test.expected b/java/ql/test/kotlin/library-tests/string-charat/test.expected
new file mode 100644
index 00000000000..ab1ff9b6d5f
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/string-charat/test.expected
@@ -0,0 +1,2 @@
+| Test.java:3:36:3:46 | charAt(...) |
+| test.kt:2:20:2:23 | charAt(...) |
diff --git a/java/ql/test/kotlin/library-tests/string-charat/test.kt b/java/ql/test/kotlin/library-tests/string-charat/test.kt
new file mode 100644
index 00000000000..c586f3d0171
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/string-charat/test.kt
@@ -0,0 +1,2 @@
+
+fun f(x: String) = x[0]
diff --git a/java/ql/test/kotlin/library-tests/string-charat/test.ql b/java/ql/test/kotlin/library-tests/string-charat/test.ql
new file mode 100644
index 00000000000..ab60ba2525d
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/string-charat/test.ql
@@ -0,0 +1,4 @@
+import java
+
+from MethodAccess ma
+select ma