Fixed orphan detection