follow-up to previous commit