Fix Issue on Slow Server with big HiveDB