Fix #129: switch case bug with logic operators