Fixed issue with variable names