Fixed orphaned pins