Changed orphan presence check to length check