Improve #36