Improve #46