setup fix mainly