Fixed the most ridiculous bug ever...
Because of the merging with the 1.6 branch, two versions of the same
classes were introduced, and they weren't consistently used. And yes,
that caused some problems.