Fixing cascade issue.