Bugfix and self-review.