Fixed for Clean Install