Fixed issue with launch that should be checked at a later time