Fix1
Fix2
Merge branch 'f-do-1'