fixed bug
Merge branch 'enh/CompleteTkregister2' into experimental