added support for variables with an underscore in the name@