fixed some variable conflict