(Issue 579) Self-review