fixing  setup