FIX proper state for feature extraction on full datasets