fix initialSetup