Fix variables access