Follow-up to previous commit