This makes more sense, according to the spec.
Fixes #11.