Fix previous commit regression