Self-review and bugfix.