-Fixed issue with break;-s being removed from switch if condition not true