- Fix bug on variable setting