fix #36, variable names with keywords in them