Fixed conflicting variables