Improve #10