Fix variable setup