Fixed issue with registration #4050