Fix variable overide