fixes with variable names