Fix to setup