And also fix it for the library.