Fix to launcher