Improve #14.