Fixing both `line` and `source`