Improve #27