Important fix: Add breaks to switch