* fixed-issue

* removed-variable-name-errors

* reverted-last-commit

Co-authored-by: Diego Mello <diegolmello@gmail.com>