fixed conflict of variable names