Handle the done case better.

See #165
1.0.7