add support for no double wrapping