Rebuild, lib parsing fixed