diff --git a/app/src/main/java/agzam/vyatsu/data/remote/TeacherScheduleParser.kt b/app/src/main/java/agzam/vyatsu/data/remote/TeacherScheduleParser.kt
index dead194..d2b5f0e 100644
--- a/app/src/main/java/agzam/vyatsu/data/remote/TeacherScheduleParser.kt
+++ b/app/src/main/java/agzam/vyatsu/data/remote/TeacherScheduleParser.kt
@@ -15,8 +15,8 @@ object TeacherScheduleParser {
 
     private val DAY_REGEX = Regex("""^(понедельник|вторник|среда|четверг|пятница|суббота|воскресенье)\s+(\d{2}\.\d{2}\.\d{2})$""")
     private val INTERVAL_REGEX = Regex("""^(\d{2}:\d{2})-(\d{2}:\d{2})$""")
-    private val GROUP_TOKEN = Regex("""(?U)\b[А-ЯЁа-яё]{1,4}-\d{2,4}-\d{2}-\d{2}\b""")
-    private val SPLIT_BY_GROUP = Regex("""(?U)(?=\b[А-ЯЁа-яё]{1,4}-\d{2,4}-\d{2}-\d{2}\b)""")
+    private val GROUP_TOKEN = Regex("""(?<![\p{L}\p{N}])[А-ЯЁа-яё]{1,4}-\d{2,4}-\d{2}-\d{2}(?![\p{L}\p{N}])""")
+    private val SPLIT_BY_GROUP = Regex("""(?=(?<![\p{L}\p{N}])[А-ЯЁа-яё]{1,4}-\d{2,4}-\d{2}-\d{2}(?![\p{L}\p{N}]))""")
     private val DATE_FMT = DateTimeFormatter.ofPattern("dd.MM.yy")
 
     data class ParsedTeacherSchedule(val teachers: List<String>, val days: List<Day>)