Bugfix for ChangeLogToken Workaround