fixed cascade again and again
Merge pull request #13 from pay-tong/devFixcascadeAgain

fixed cascade again and again