modify for HADOOP-9750