Fix variable conflict