fixed launch issues