regression: fixed previous commit omissions