modify for HIVE-2137
modify for HIVE-2137
modify for HIVE-2137
modify for HIVE-2137