Resolves #71.

The last of all bugs I'm aware about.