diff --git a/lib/src/dart3_suggestors/null_safety_prep/required_flux_props.dart b/lib/src/dart3_suggestors/null_safety_prep/required_flux_props.dart
index ea4ed20f..ad64a49d 100644
--- a/lib/src/dart3_suggestors/null_safety_prep/required_flux_props.dart
+++ b/lib/src/dart3_suggestors/null_safety_prep/required_flux_props.dart
@@ -46,10 +46,9 @@ class RequiredFluxProps extends RecursiveAstVisitor with ClassSuggestor {
             .whereType<MethodDeclaration>()
             .firstOrNull
             ?.name
-            .value()
-            .toString()
-            .contains(RegExp(r'getDefaultProps|defaultProps')) ==
-        true;
+            .lexeme
+            .contains(RegExp(r'getDefaultProps|defaultProps')) ??
+        false;
     if (isReturnedAsDefaultProps) return;
 
     final maybeFluxUiPropsMixin = cascadeWriteEl.mixins
@@ -86,15 +85,7 @@ class RequiredFluxProps extends RecursiveAstVisitor with ClassSuggestor {
   }
 
   void yieldNewCascadeSection(CascadeExpression node, String newSection) {
-    final sf = context.sourceFile;
-    final targetLineOffset = sf.getOffset(sf.getLine(node.target.offset));
-    int offset;
-    if (targetLineOffset == sf.getOffset(sf.getLine(node.target.end))) {
-      // Cascade on a single line / same line as the target, add the new setter(s) before the semicolon
-      offset = node.target.end;
-    } else {
-      offset = sf.getOffsetOfLineAfter(node.target.offset);
-    }
+    final offset = node.target.end;
     yieldPatch(newSection, offset, offset);
   }