diff --git a/src/do.cr b/src/do.cr
index 7e320e8..84477c5 100644
--- a/src/do.cr
+++ b/src/do.cr
@@ -1,6 +1,5 @@
 
 class Baguette::Context
-	#class_property logfile_path = "#{@working_directory}/#{@recipe.not_nil!.working_uuid}.log"
 	class_property logfile_path = "/tmp/package-create.log"
 	class_property no_logfile = false
 end
diff --git a/src/main.cr b/src/main.cr
index 3d84f4e..327ea29 100644
--- a/src/main.cr
+++ b/src/main.cr
@@ -173,6 +173,9 @@ begin
 	recipes.each do |recipe|
 		latest_build_dir = recipe.building_directory
 
+		Baguette::Context.logfile_path  = "#{context.working_directory}/"
+		Baguette::Context.logfile_path += "#{@recipe.working_uuid}.log"
+
 		Baguette::Log.title recipe.name
 
 		recipe.download