Attempt for #41.