More robust setup