fix setup...