Fix for space-separated classes.

Fixed in another branch, but for the sake of the PR.