fixed todo
Merge branch 'hotfix' into todo-test