Also fix a bug that prevents installation of multiple branches / official client, thanks whovian for pointing it out.
