fixed cascade problem