Issue 715 skip orphans

Fixes #715.

Reopened since I closed the original by accident.