Fix for broken clean install