Fix for clean install