Follow-up (#654)