Fixed some valriable changes issue