locking in patched version of hive-model