Bugfixes Chomsky.