fixed: deprecated variables access