Make --launch more reliable