Installer: Another attempt to fix #372