Follow-up (#688)