More for #8 that missed the earlier commit