no-history bugfix, guid refactoring