improve wrap support