Fix registration core.
Merge pull request #479 from gsn/master

Fix registration core.