Fixed registration problems
...