Fix #90 bug (switch case stetaments)