[lib] Fixing issue with exclusive scope