Try to fix up pca/non-pca preprocessing.