Use correct number of features