Fix variables initialization