diff --git a/src/kemal.cr b/src/kemal.cr
index d7b6255..31a03bf 100644
--- a/src/kemal.cr
+++ b/src/kemal.cr
@@ -31,7 +31,7 @@ at_exit do
   # This route serves the built-in images for not_found and exceptions.
   get "/__kemal__/:image" do |env|
     image = env.params["image"]
-    file_path = File.expand_path("libs/kemal/images/#{image}", Dir.working_directory)
+    file_path = File.expand_path("libs/kemal/images/#{image}", Dir.current)
     env.add_header "Content-Type", "application/octet-stream"
     File.read(file_path)
   end
diff --git a/src/kemal/config.cr b/src/kemal/config.cr
index 88eed52..713e3ae 100644
--- a/src/kemal/config.cr
+++ b/src/kemal/config.cr
@@ -34,10 +34,10 @@ module Kemal
     # config.yml
     # public_folder = "root/to/folder"
     def read_file
-      path = File.expand_path("config.yml", Dir.working_directory)
+      path = File.expand_path("config.yml", Dir.current)
       if File.exists?(path)
         data = YAML.load(File.read(path)) as Hash
-        public_folder = File.expand_path("./#{data["public_folder"]}", Dir.working_directory)
+        public_folder = File.expand_path("./#{data["public_folder"]}", Dir.current)
         @public_folder = public_folder
       end
     end