fixed orphaning issue