Finally fixed the double launching bug