Improve #8 and #14