Hopefully fixing new installations