Adding fix for accessing variable names with .'s in them.