HIVE-7527: fix according to review