debugging: Fixing switch capturing and continuation