diff --git a/src/gears/vulkan.d b/src/gears/vulkan.d
index 61d6ab1..d26bf6b 100644
--- a/src/gears/vulkan.d
+++ b/src/gears/vulkan.d
@@ -707,12 +707,6 @@ ImmSubmit(Vulkan* vk, void delegate() fn)
 		success = VkCheck("ImmSubmit failure: vkQueueSubmit2 error", result);
 	}
 
-	if (success)
-	{
-		result = vkWaitForFences(vk.device, 1, &vk.imm_fence, true, 999999999);
-		success = VkCheck("ImmSubmit failure: vkWaitForFences post submission error", result);
-	}
-
 	return success;
 }
 
@@ -974,11 +968,20 @@ Transfer(T)(Vulkan* vk, Buffer* buf, T[] data)
 bool
 Transfer(Vulkan* vk, Buffer* buf, u8[] data)
 {
-	bool success = true;
+	bool success = TransferReady(vk);
 
 	u64 copied = 0;
-	while(copied != data.length)
+	while(copied != data.length && success)
 	{
+		if (copied != 0)
+		{
+			success = TransferReady(vk);
+			if (!success)
+			{
+				break;
+			}
+		}
+		
 		u64 transfer_length = cast(u64)vk.transfer_buf.data.length;
 		u64 data_length = cast(u64)data.length - copied;
 		u64 copy_length = transfer_length > data_length ? data_length : transfer_length;
@@ -1009,20 +1012,34 @@ Transfer(T)(Vulkan* vk, Buffer* buf, T* ptr)
 {
 	assert(T.sizeof < vk.transfer_buf.data.length, "Transfer failure: structure size is too large");
 
-	memcpy(vk.transfer_buf.data.ptr, ptr, T.sizeof);
-
-	auto fn = delegate()
+	bool success = TransferReady(vk);
+	if (success)
 	{
-		VkBufferCopy copy = {
-			srcOffset: 0,
-			dstOffset: 0,
-			size: T.sizeof,
+		memcpy(vk.transfer_buf.data.ptr, ptr, T.sizeof);
+
+		auto fn = delegate()
+		{
+			VkBufferCopy copy = {
+				srcOffset: 0,
+				dstOffset: 0,
+				size: T.sizeof,
+			};
+
+			vkCmdCopyBuffer(vk.imm_cmd, vk.transfer_buf.buffer, buf.buffer, 1, &copy);
 		};
 
-		vkCmdCopyBuffer(vk.imm_cmd, vk.transfer_buf.buffer, buf.buffer, 1, &copy);
-	};
+		success = ImmSubmit(vk, fn);
+	}
 
-	return ImmSubmit(vk, fn);
+	return success;
+}
+
+// Needs to be done before writing to the transfer buffer as otherwise it'll overwrite it while previous transfers are occurring
+bool
+TransferReady(Vulkan* vk)
+{
+	VkResult result = vkWaitForFences(vk.device, 1, &vk.imm_fence, true, 999999999);
+	return VkCheck("Transfer failure: vkWaitForFences error", result);
 }
 
 pragma(inline): bool