fix ctrl
Merge branch 't1'