FIX: Fixed rare occuring encoding problems of vars in several places

Conflicts:
	ChangeLog