Fixed setup a bit