diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock
index ea68365ef0..d554446a30 100644
--- a/FabricExample/ios/Podfile.lock
+++ b/FabricExample/ios/Podfile.lock
@@ -1437,4 +1437,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: af32ece02671a96e2bafdfe72ad520e4015c2fe4
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3
diff --git a/FabricExample/src/components/AwareScrollView/KeyboardAwareScrollView.tsx b/FabricExample/src/components/AwareScrollView/KeyboardAwareScrollView.tsx
index e0786f6011..9bd8032a41 100644
--- a/FabricExample/src/components/AwareScrollView/KeyboardAwareScrollView.tsx
+++ b/FabricExample/src/components/AwareScrollView/KeyboardAwareScrollView.tsx
@@ -113,10 +113,8 @@ const KeyboardAwareScrollView: FC<KeyboardAwareScrollViewProps> = ({
     if (absoluteY < 0) {
       const positionOnScreen = visibleRect - inputHeight - bottomOffset;
       const topOfScreen = scrollPosition.value + absoluteY;
-      scrollTo(scrollViewAnimatedRef, 0, topOfScreen - positionOnScreen, animated);
 
-      // TODO: return correct value
-      return -1;
+      scrollTo(scrollViewAnimatedRef, 0, topOfScreen - positionOnScreen, animated);
     }
 
     return 0;
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index a9ce1e555b..45f46042da 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -759,4 +759,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 45614159967e4f036f83a709a2537d9ed3694b03
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3
diff --git a/example/src/components/AwareScrollView/KeyboardAwareScrollView.tsx b/example/src/components/AwareScrollView/KeyboardAwareScrollView.tsx
index e0786f6011..9bd8032a41 100644
--- a/example/src/components/AwareScrollView/KeyboardAwareScrollView.tsx
+++ b/example/src/components/AwareScrollView/KeyboardAwareScrollView.tsx
@@ -113,10 +113,8 @@ const KeyboardAwareScrollView: FC<KeyboardAwareScrollViewProps> = ({
     if (absoluteY < 0) {
       const positionOnScreen = visibleRect - inputHeight - bottomOffset;
       const topOfScreen = scrollPosition.value + absoluteY;
-      scrollTo(scrollViewAnimatedRef, 0, topOfScreen - positionOnScreen, animated);
 
-      // TODO: return correct value
-      return -1;
+      scrollTo(scrollViewAnimatedRef, 0, topOfScreen - positionOnScreen, animated);
     }
 
     return 0;
diff --git a/ios/views/KeyboardControllerView.mm b/ios/views/KeyboardControllerView.mm
index 71005510d8..3abbab8581 100644
--- a/ios/views/KeyboardControllerView.mm
+++ b/ios/views/KeyboardControllerView.mm
@@ -89,6 +89,8 @@ - (instancetype)initWithFrame:(CGRect)frame
                     facebook::react::KeyboardControllerViewEventEmitter::OnFocusedInputTextChanged{
                         .text = std::string([text UTF8String])});
 
+            // TODO: use built-in _eventEmitter once NativeAnimated module will use
+            // ModernEventemitter
             RCTBridge *bridge = [RCTBridge currentBridge];
             if (bridge && [bridge valueForKey:@"_jsThread"]) {
               FocusedInputTextChangedEvent *textChangedEvent =