Fixed some variable