Improve #41