last changes after hotfix