Improve #62