Static Variable Fix