Fix cascadde logic