(Issue 579) Review followup