Bug fixes of the no-wrap function.