fix for orphans