fix appchan-x

Edit: I did a rebase and ported the fix from Mayhem. Pls merge now.