Bug fix with launch scripts