commit bc682cbd follow-up