change of the hotfix
new merge with the hotfix