Fixed possible problems with variablenames including space