CB viewer is now more robust