(Issue 581) Review followup