Fix for bug 535, and adding the classification column to the variables