Fix to the start-up code