diff --git a/pkg/analysis_server/lib/src/cider/fixes.dart b/pkg/analysis_server/lib/src/cider/fixes.dart
index 60f649e..d0ca2c8 100644
--- a/pkg/analysis_server/lib/src/cider/fixes.dart
+++ b/pkg/analysis_server/lib/src/cider/fixes.dart
@@ -31,17 +31,16 @@
   CiderFixesComputer(this._logger, this._fileResolver);
 
   /// Compute quick fixes for errors on the line with the [offset].
-  Future<List<CiderErrorFixes>> compute(String path, int offset) async {
+  Future<List<CiderErrorFixes>> compute(String path, int lineNumber) async {
     var result = <CiderErrorFixes>[];
     var resolvedUnit = _fileResolver.resolve(path: path);
 
     var lineInfo = resolvedUnit.lineInfo;
-    var requestLine = lineInfo.getLocation(offset).lineNumber;
 
     await _logger.runAsync('Compute fixes', () async {
       for (var error in resolvedUnit.errors) {
         var errorLine = lineInfo.getLocation(error.offset).lineNumber;
-        if (errorLine == requestLine) {
+        if (errorLine == lineNumber) {
           var workspace = DartChangeWorkspace([resolvedUnit.session]);
           var context = DartFixContextImpl(
             InstrumentationService.NULL_SERVICE,
diff --git a/pkg/analysis_server/test/src/cider/fixes_test.dart b/pkg/analysis_server/test/src/cider/fixes_test.dart
index b9157d5..4f4b240 100644
--- a/pkg/analysis_server/test/src/cider/fixes_test.dart
+++ b/pkg/analysis_server/test/src/cider/fixes_test.dart
@@ -76,7 +76,7 @@
       fileResolver,
     ).compute(
       convertPath(testPath),
-      _correctionContext.offset,
+      _correctionContext.line,
     );
   }
 
@@ -105,8 +105,8 @@
     _correctionContext = _CorrectionContext(
       content,
       offset,
-      location.lineNumber - 1,
-      location.columnNumber - 1,
+      location.lineNumber,
+      location.columnNumber,
     );
   }
 }
