First bug fix of launch