Fix new feature for big projects