diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 432292b394..5d116e82c8 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -153,7 +153,7 @@ static void *lock_broker(void *unused)
 
 static int null_hash_cb(const void *obj, const int flags)
 {
-	return abs((int)(long) obj);
+	return (int)(long) obj;
 }
 
 static int null_cmp_cb(void *obj, void *arg, int flags)
diff --git a/main/astobj2.c b/main/astobj2.c
index 378a8311ed..c49432fa10 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -503,7 +503,7 @@ static struct bucket_list *__ao2_link(struct ao2_container *c, void *user_data)
 	if (!p)
 		return NULL;
 
-	i = c->hash_fn(user_data, OBJ_POINTER);
+	i = abs(c->hash_fn(user_data, OBJ_POINTER));
 
 	ao2_lock(c);
 	i %= c->n_buckets;