Bug fix on new locking for Host lock