Fixed an issue with .s in variable names.