Prelaunch fix