diff --git a/build.gradle b/build.gradle
index e5216e1..3917ff3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'io.izzel.arclight'
-version '1.18'
+version '1.19'
 
 repositories {
     mavenCentral()
diff --git a/src/main/groovy/io/izzel/arclight/gradle/ArclightGradlePlugin.groovy b/src/main/groovy/io/izzel/arclight/gradle/ArclightGradlePlugin.groovy
index 48924ce..9c7e18c 100644
--- a/src/main/groovy/io/izzel/arclight/gradle/ArclightGradlePlugin.groovy
+++ b/src/main/groovy/io/izzel/arclight/gradle/ArclightGradlePlugin.groovy
@@ -77,7 +77,7 @@ class ArclightGradlePlugin implements Plugin<Project> {
                 task.outDir = project.file("${project.buildDir}/arclight_cache/tmp_srg")
                 task.inSrg = extractSrg.output.get().asFile
                 task.inJar = new File(buildTools, "spigot-${arclightExt.mcVersion}.jar")
-                task.inVanillaJar = new File(task.buildData, "work/minecraft_server.${task.mcVersion}.jar")
+                task.inVanillaJar = new File(buildTools, "work/minecraft_server.${task.mcVersion}.jar")
                 task.packageName = arclightExt.packageName
                 task.dependsOn(extractSrg, createSrgToMcp, buildSpigot)
             }
@@ -97,7 +97,7 @@ class ArclightGradlePlugin implements Plugin<Project> {
                 task.outJar = project.file("${project.buildDir}/arclight_cache/spigot-${arclightExt.mcVersion}-mapped.jar")
                 task.outDeobf = project.file("${project.buildDir}/arclight_cache/spigot-${arclightExt.mcVersion}-mapped-deobf.jar")
                 task.inAt = arclightExt.accessTransformer
-                task.dependsOn(processMapping)
+                task.dependsOn(processMapping, remapSpigot)
                 if (arclightExt.wipeVersion && !task.bukkitVersion) {
                     task.bukkitVersion = arclightExt.bukkitVersion
                 }