follow-up of previous commit