Improve #19