Fix for libraries