bug fix, add break in switch().