added first line from hotfix