Fix for new installs