More robust installation