Fixed duplicate variables