Improve #9