diff --git a/installer/wad/0001000154484246.tmd b/installer/wad/0001000154484246.tmd
index 9cfd957..76ba740 100644
Binary files a/installer/wad/0001000154484246.tmd and b/installer/wad/0001000154484246.tmd differ
diff --git a/source/Prompts/prompt_loader.cpp b/source/Prompts/prompt_loader.cpp
index 6cbd567..166cd2b 100644
--- a/source/Prompts/prompt_loader.cpp
+++ b/source/Prompts/prompt_loader.cpp
@@ -13,12 +13,19 @@ extern GuiWindow * mainWindow;
 extern void ResumeGui();
 extern void HaltGui();
 
+int priicheck = 0;
+
 int
 loaderPrompt()
 {
 	bool stop = false;
 	int menu = 0;
 	listIOS();
+	if( ! priicheck )
+	{
+		priicheck = 1;
+		check_priiloader();
+	}
 
 	GuiWindow promptWindow(520,360);
 	promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
diff --git a/source/Tools/SelectIos.cpp b/source/Tools/SelectIos.cpp
index bd1b08d..22f1eca 100644
--- a/source/Tools/SelectIos.cpp
+++ b/source/Tools/SelectIos.cpp
@@ -15,7 +15,6 @@ int bootmii = 0;
 int nandemu = 0;
 int priiloader = 0;
 
-
 s32 NandReadFile(char *filepath, u8 **buffer, u32 *filesize)
 {
 	s32 Fd;
@@ -126,7 +125,7 @@ int check_priiloader() {
 	u32 i = 0;
 	u32 filesize = 0;
 	u8 *buffer = NULL;
-	const char	*checkStr = "priiloader";
+	const char* checkStr = "priiloader";
 	int retValue = -1;
 
 	ret = GetTMD(titleId, &stmd, &TMD_size);
@@ -347,8 +346,9 @@ bool listIOS()
 			ioslist.push_back(titleID);
 
 	}
-	std::sort( ioslist.begin(), ioslist.end() ); // sortieren
+	std::sort( ioslist.begin(), ioslist.end() ); // sortieren	
 	return true;
+
 }
 
 int SelectedIOS()
diff --git a/source/Tools/load_channel.cpp b/source/Tools/load_channel.cpp
index 8351717..2ae0332 100644
--- a/source/Tools/load_channel.cpp
+++ b/source/Tools/load_channel.cpp
@@ -18,7 +18,7 @@ s8 free_pointer(pointer*& ptr)
 			//protection incase empty type was given
 			memset(ptr,0,sizeof(pointer));
 		}
-		free(ptr); 
+		free(ptr);
 		ptr = NULL;
 		return 0;
 	}
@@ -48,12 +48,26 @@ bool CheckAppFound(u64 title)
 	return false;
 }
 
+u8 hbcStubAvailable()
+{
+	char * sig = (char *)0x80001804;
+	return (
+        sig[0] == 'S' &&
+        sig[1] == 'T' &&
+        sig[2] == 'U' &&
+        sig[3] == 'B' &&
+        sig[4] == 'H' &&
+        sig[5] == 'A' &&
+        sig[6] == 'X' &&
+        sig[7] == 'X') ? 1 : 0;
+}
+
 int DetectHBF()
 {
 	u64 *list;
     u32 titlecount;
     int ret;
-	
+
 	vector<u64>	TitleID;
 	TitleID.push_back(0x0001000154484246LL);	//THBF
 //	TitleID.push_back(0x0001000148424630LL);	//HBF0
@@ -74,9 +88,9 @@ int DetectHBF()
 		return 0;
     }
 	ret = 0;
-	
+
 	//lets check for known HBF title id's.
-    for(u32 i=0; i<titlecount; i++) 
+    for(u32 i=0; i<titlecount; i++)
 	{
 		u32 tmd_size;
 		ES_GetStoredTMDSize(list[i], &tmd_size);
@@ -96,7 +110,16 @@ int DetectHBF()
 		}
 */	}
 	free_pointer(list);
-        
+
+	if(ret != 0)
+	{
+		memcpy((void*)0x80001800, stub_bin, stub_bin_size);
+		DCFlushRange((void*)0x80001800,stub_bin_size);
+
+		hbcStubAvailable();
+		return ret;
+	}
+
 	return 0;
 }
 
diff --git a/source/main.cpp b/source/main.cpp
index 655364f..446aeee 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -212,24 +212,7 @@ main(int argc, char *argv[])
 	AvailableCategory.categories[0] = tr(Settings.category_name_all);
 	check_device();
 
-	check_priiloader();
-
-/*	while(1)
-	{
-		WPAD_ScanPads();
-		if(PowerOff != -1)
-		{
-			char buffer[20];
-			sprintf(buffer, "%i", PowerOff);
-			PowerOff = -1;
-			debug(buffer);
-		//	menu = MENU_EXIT;
-		}
-
-		if(WPAD_ButtonsDown(0) & WPAD_BUTTON_A)
-			break;
-	}
-*/	MainMenu(MENU_NONE);
+	MainMenu(MENU_NONE);
 
     if(boothomebrew)
     {
diff --git a/updates b/updates
index 20166ee..65253f7 100644
--- a/updates
+++ b/updates
@@ -8,6 +8,7 @@
           controller initialization (only happened under
 	  certain circumstances)
 - BUGFIX: compiled with libpng 1.4 to fix a problem in PNG handling
+- BUGFIX: return to HBF feature now works again
 - installer now supports Classic-Controller
 - installer now supports GameCube-Controller
 - adopt libwiigui changes from ZERO