Reader: Fixed issue with the switcher. Fixed #33