[lib] Cleaner fix