Fix 'admin only' issue with merge_with