Bug fix for test-hive.