Bugfix for Hadoop 1