More for #41.