Fixed the setup finally