make compatible with hive 12