Better install behaviour