fix register window
Merge origin/master