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

Fix registration core.