Fix for Library registration