fixed: deprecated variables access
Pulled #13