Issue 715 skip orphans

Will fix #715 once merged.