more setup fixing