Hotfix2

merge into master from hotfix2