modify for HIVE-2137