modified in hotfix branch, committed to master