Fix bug: confict of variable names