Fix variables again