Startup fix (2nd attempt)