fixed conflict between variables