registration bug fix
Merge origin/master