Use correct initialization of some vars