New attempt for #41.