Fixed bugs (copy-paste errors) => rebuild and in lib