Fixed temporarily the setup