fix registration problem
Merge