Merging Return to Library fix