Fixed SafeStart component