Startup Bug Fix Attempt #1