Fix for startups