Switch statement fixed again.