Fix variable override