Fix initialSetup()