HIVE:5871: refine the patch