diff --git a/base/VulkanModel.hpp b/base/VulkanModel.hpp
index f1b7eded..92a560d3 100644
--- a/base/VulkanModel.hpp
+++ b/base/VulkanModel.hpp
@@ -153,7 +153,7 @@ namespace vks
 		* @param copyQueue Queue used for the memory staging copy commands (must support transfer)
 		* @param (Optional) flags ASSIMP model loading flags
 		*/
-		bool loadFromFile(vk::VulkanDevice *device, const std::string& filename, vks::VertexLayout layout, vks::ModelCreateInfo *createInfo, VkQueue copyQueue, const int flags = defaultFlags)
+		bool loadFromFile(const std::string& filename, vks::VertexLayout layout, vks::ModelCreateInfo *createInfo, vk::VulkanDevice *device, VkQueue copyQueue, const int flags = defaultFlags)
 		{
 			this->device = device->logicalDevice;
 
@@ -379,10 +379,10 @@ namespace vks
 		* @param copyQueue Queue used for the memory staging copy commands (must support transfer)
 		* @param (Optional) flags ASSIMP model loading flags
 		*/
-		bool loadFromFile(vk::VulkanDevice *device, const std::string& filename, vks::VertexLayout layout, float scale, VkQueue copyQueue, const int flags = defaultFlags)
+		bool loadFromFile(const std::string& filename, vks::VertexLayout layout, float scale, vk::VulkanDevice *device, VkQueue copyQueue, const int flags = defaultFlags)
 		{
 			vks::ModelCreateInfo modelCreateInfo(scale, 1.0f, 0.0f);
-			return loadFromFile(device, filename, layout, &modelCreateInfo, copyQueue, flags);
+			return loadFromFile(filename, layout, &modelCreateInfo, device, copyQueue, flags);
 		}
 	};
 };
\ No newline at end of file
diff --git a/hdr/hdr.cpp b/hdr/hdr.cpp
index 266e3758..c9268f22 100644
--- a/hdr/hdr.cpp
+++ b/hdr/hdr.cpp
@@ -600,11 +600,11 @@ public:
 	void loadAssets()
 	{
 		// Models
-		models.skybox.loadFromFile(vulkanDevice, getAssetPath() + "models/cube.obj", vertexLayout, 0.05f, queue);
+		models.skybox.loadFromFile(getAssetPath() + "models/cube.obj", vertexLayout, 0.05f, vulkanDevice, queue);
 		std::vector<std::string> filenames = {"sphere.obj", "teapot.dae", "torusknot.obj"};
 		for (auto file : filenames) {
 			vks::Model model;
-			model.loadFromFile(vulkanDevice, getAssetPath() + "models/" + file, vertexLayout, 0.05f, queue);
+			model.loadFromFile(getAssetPath() + "models/" + file, vertexLayout, 0.05f, vulkanDevice, queue);
 			models.objects.push_back(model);
 		}