Fix sub items destrction issue