Fixed cascade bugs