More for #411.