Potential fix for SafeStart component