Фикс заикания

(cherry picked from commit fa13381cf1c6b5adfd0ac694f487694caf18994d)