Variables Fix