Fix the brokenness.

This is ad hoc. Feel free to fix it in a more elegant way.
Merge pull request #13 from u-c-l/broken-but-fast

Fix the brokenness.