* Global variables leakage fix