try fix with registration
Merge branch 'develop'